Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark 'group names supported' in the groups cluster feature map #20458

Merged
merged 1 commit into from
Jul 9, 2022

Conversation

andy31415
Copy link
Contributor

Problem

Group name support must be in sync between feature map and namesupport. Only namesupport used to be set.

Fixes #19613

Change overview

  • Define the feature map bitflags in xml
  • Use the feature map bitflags in groups server
  • minor constant rename for namesupport flags

Testing

Compiled all-clusters-app on linux. Got:

❯ ./out/linux-x64-chip-tool/chip-tool groups read name-support 1 0 | grep -A1 'Endpoint: 0 Cluster:'
[1657221972.727541][3275513:3275519] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_0000 DataVersion: 2315505673
[1657221972.727546][3275513:3275519] CHIP:TOO:   name support: 128
❯ ./out/linux-x64-chip-tool/chip-tool groups read feature-map 1 0 | grep -A1 'Endpoint: 0 Cluster:'
[1657221979.096411][3275989:3275995] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_FFFC DataVersion: 2315505673
[1657221979.096414][3275989:3275995] CHIP:TOO:   FeatureMap: 1

@github-actions
Copy link

github-actions bot commented Jul 7, 2022

PR #20458: Size comparison from 4f7d5cf to 2cbdec3

Increases above 0.2%:

platform target config section 4f7d5cf 2cbdec3 change % change
efr32 lighting-app BRD4161A+rpc (read/write) 151948 1135068 983120 647.0
Increases (34 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 4f7d5cf 2cbdec3 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 665651 665699 48 0.0
.text 577268 577316 48 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 631443 631491 48 0.0
.text 553812 553860 48 0.0
lock-ftd LP_CC2652R7 (read only) 668551 668599 48 0.0
.text 591864 591912 48 0.0
lock-mtd LP_CC2652R7 (read only) 617959 618007 48 0.0
.text 541384 541432 48 0.0
pump-app LP_CC2652R7 (read only) 677695 677703 8 0.0
.text 588780 588788 8 0.0
shell LP_CC2652R7 (read only) 658150 658182 32 0.0
.text 572988 573020 32 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 579134 579182 48 0.0
.app_xip_area 457904 457952 48 0.0
lock cyw930739m2evb_01 (read/write) 585070 585110 40 0.0
.app_xip_area 459104 459144 40 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 582198 582206 8 0.0
.app_xip_area 461816 461824 8 0.0
efr32 lighting-app BRD4161A (read/write) 1080652 1080740 88 0.0
.text 945588 945676 88 0.0
BRD4161A+rpc (read/write) 151948 1135068 983120 647.0
.text 983032 983112 80 0.0
BRD4161A+rs911x (read/write) 946756 946844 88 0.0
.text 803920 804008 88 0.0
lock-app BRD4161A+wf200 (read/write) 1127944 1128048 104 0.0
.text 981676 981780 104 0.0
window-app BRD4161A (read/write) 1074436 1074540 104 0.0
.text 937868 937972 104 0.0
esp32 all-clusters-app c3devkit (read only) 1019474 1019534 60 0.0
(read/write) 1485458 1485490 32 0.0
.flash.rodata 215344 215376 32 0.0
.flash.text 1019474 1019534 60 0.0
m5stack (read only) 1073383 1073435 52 0.0
(read/write) 487536 487568 32 0.0
.flash.rodata 245796 245828 32 0.0
.flash.text 1067999 1068051 52 0.0
k32w light k32w061+release (read/write) 658192 658240 48 0.0
.text 580884 580932 48 0.0
lock k32w061+release (read/write) 684964 684996 32 0.0
.text 607180 607212 32 0.0
linux all-clusters-app debug (read only) 2957793 2958049 256 0.0
.rodata 263549 263581 32 0.0
.text 2517058 2517282 224 0.0
all-clusters-minimal-app debug (read only) 2810337 2810593 256 0.0
.rodata 265245 265277 32 0.0
.text 2370082 2370306 224 0.0
lighting-app debug+rpc (read only) 2548249 2548505 256 0.0
.rodata 213608 213640 32 0.0
.text 2164674 2164898 224 0.0
lock-app debug (read only) 2512865 2513105 240 0.0
.rodata 228648 228680 32 0.0
.text 2119074 2119282 208 0.0
shell debug (read only) 2548121 2548361 240 0.0
.rodata 227666 227698 32 0.0
.text 2163378 2163586 208 0.0
thermostat-no-ble arm64 (read only) 2592644 2592868 224 0.0
.rodata 165348 165380 32 0.0
.text 2187520 2187712 192 0.0
tv-casting-app debug (read only) 5562817 5563073 256 0.0
.rodata 343209 343241 32 0.0
.text 4941746 4941970 224 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read/write) 2447424 2447528 104 0.0
.text 1410068 1410172 104 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1174495 1174579 84 0.0
rodata 141776 141812 36 0.0
text 810916 810972 56 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1154691 1154771 80 0.0
rodata 133308 133340 32 0.0
text 800360 800416 56 0.0
p6 all-clusters-app default (read/write) 2563896 2563992 96 0.0
.text 1522160 1522256 96 0.0
all-clusters-minimal-app default (read/write) 2508952 2509048 96 0.0
.text 1467216 1467312 96 0.0
light-app default (read/write) 2439240 2439336 96 0.0
.text 1397504 1397600 96 0.0
lock-app default (read/write) 2466496 2466584 88 0.0
.text 1424760 1424848 88 0.0
telink light-switch-app tlsr9518adk80d (read/write) 796636 796728 92 0.0
text 565130 565192 62 0.0
lighting-app tlsr9518adk80d (read/write) 816464 816564 100 0.0
text 581452 581516 64 0.0
Decreases (4 builds for cc13x2_26x2)
platform target config section 4f7d5cf 2cbdec3 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 185572 185524 -48 -0.0
lock-ftd LP_CC2652R7 (read/write) 172816 172768 -48 -0.0
pump-app LP_CC2652R7 (read/write) 164520 164512 -8 -0.0
shell LP_CC2652R7 (read/write) 188576 188544 -32 -0.0
Full report (41 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 4f7d5cf 2cbdec3 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 665651 665699 48 0.0
(read/write) 185572 185524 -48 -0.0
.bss 74116 74116 0 0.0
.data 3356 3356 0 0.0
.rodata 88067 88067 0 0.0
.text 577268 577316 48 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 631443 631491 48 0.0
(read/write) 157684 157684 0 0.0
.bss 73412 73412 0 0.0
.data 3356 3356 0 0.0
.rodata 77307 77307 0 0.0
.text 553812 553860 48 0.0
lock-ftd LP_CC2652R7 (read only) 668551 668599 48 0.0
(read/write) 172816 172768 -48 -0.0
.bss 71148 71148 0 0.0
.data 3280 3280 0 0.0
.rodata 76207 76207 0 0.0
.text 591864 591912 48 0.0
lock-mtd LP_CC2652R7 (read only) 617959 618007 48 0.0
(read/write) 144264 144264 0 0.0
.bss 66868 66868 0 0.0
.data 3280 3280 0 0.0
.rodata 76087 76087 0 0.0
.text 541384 541432 48 0.0
pump-app LP_CC2652R7 (read only) 677695 677703 8 0.0
(read/write) 164520 164512 -8 -0.0
.bss 71228 71228 0 0.0
.data 3280 3280 0 0.0
.rodata 88431 88431 0 0.0
.text 588780 588788 8 0.0
pump-controller-app LP_CC2652R7 (read only) 663527 663527 0 0.0
(read/write) 178808 178808 0 0.0
.bss 71348 71348 0 0.0
.data 3276 3276 0 0.0
.rodata 84295 84295 0 0.0
.text 578752 578752 0 0.0
shell LP_CC2652R7 (read only) 658150 658182 32 0.0
(read/write) 188576 188544 -32 -0.0
.bss 76420 76420 0 0.0
.data 3360 3360 0 0.0
.rodata 84846 84846 0 0.0
.text 572988 573020 32 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 579134 579182 48 0.0
.app_xip_area 457904 457952 48 0.0
.bss 64184 64184 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 585070 585110 40 0.0
.app_xip_area 459104 459144 40 0.0
.bss 68912 68912 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 582198 582206 8 0.0
.app_xip_area 461816 461824 8 0.0
.bss 63392 63392 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1080652 1080740 88 0.0
.bss 132996 132996 0 0.0
.data 2048 2048 0 0.0
.text 945588 945676 88 0.0
BRD4161A+rpc (read/write) 151948 1135068 983120 647.0
.bss 149676 149676 0 0.0
.data 2260 2260 0 0.0
.text 983032 983112 80 0.0
BRD4161A+rs911x (read/write) 946756 946844 88 0.0
.bss 140768 140768 0 0.0
.data 2048 2048 0 0.0
.text 803920 804008 88 0.0
lock-app BRD4161A+wf200 (read/write) 1127944 1128048 104 0.0
.bss 144184 144184 0 0.0
.data 2060 2060 0 0.0
.text 981676 981780 104 0.0
window-app BRD4161A (read/write) 1074436 1074540 104 0.0
.bss 134468 134468 0 0.0
.data 2076 2076 0 0.0
.text 937868 937972 104 0.0
esp32 all-clusters-app c3devkit (read only) 1019474 1019534 60 0.0
(read/write) 1485458 1485490 32 0.0
.dram0.bss 70080 70080 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 215344 215376 32 0.0
.flash.text 1019474 1019534 60 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1073383 1073435 52 0.0
(read/write) 487536 487568 32 0.0
.dram0.bss 75600 75600 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 245796 245828 32 0.0
.flash.text 1067999 1068051 52 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 658192 658240 48 0.0
.bss 69516 69516 0 0.0
.data 1992 1992 0 0.0
.text 580884 580932 48 0.0
lock k32w061+release (read/write) 684964 684996 32 0.0
.bss 69980 69980 0 0.0
.data 2004 2004 0 0.0
.text 607180 607212 32 0.0
linux all-clusters-app debug (read only) 2957793 2958049 256 0.0
(read/write) 154744 154744 0 0.0
.bss 61536 61536 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 84968 84968 0 0.0
.dynamic 608 608 0 0.0
.got 4536 4536 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 263549 263581 32 0.0
.text 2517058 2517282 224 0.0
all-clusters-minimal-app debug (read only) 2810337 2810593 256 0.0
(read/write) 146680 146680 0 0.0
.bss 60864 60864 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 77608 77608 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 265245 265277 32 0.0
.text 2370082 2370306 224 0.0
bridge-app debug+rpc (read only) 2312761 2312761 0 0.0
(read/write) 125504 125504 0 0.0
.bss 48928 48928 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 66984 66984 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 197952 197952 0 0.0
.text 1953074 1953074 0 0.0
chip-tool debug (read only) 10292345 10292345 0 0.0
(read/write) 621312 621312 0 0.0
.bss 24728 24728 0 0.0
.data 3234 3234 0 0.0
.data.rel.ro 586944 586944 0 0.0
.dynamic 608 608 0 0.0
.got 5096 5096 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 513653 513653 0 0.0
.text 8349236 8349236 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 9986740 9986740 0 0.0
(read/write) 683569 683569 0 0.0
.bss 42609 42609 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 622480 622480 0 0.0
.dynamic 528 528 0 0.0
.got 13512 13512 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 475828 475828 0 0.0
.text 7952564 7952564 0 0.0
lighting-app debug+rpc (read only) 2548249 2548505 256 0.0
(read/write) 129528 129528 0 0.0
.bss 49440 49440 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72136 72136 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 213608 213640 32 0.0
.text 2164674 2164898 224 0.0
lock-app debug (read only) 2512865 2513105 240 0.0
(read/write) 124504 124504 0 0.0
.bss 47840 47840 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69096 69096 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 784 784 0 0.0
.rodata 228648 228680 32 0.0
.text 2119074 2119282 208 0.0
ota-provider-app debug (read only) 2319585 2319585 0 0.0
(read/write) 118312 118312 0 0.0
.bss 47488 47488 0 0.0
.data 1944 1944 0 0.0
.data.rel.ro 63096 63096 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 203416 203416 0 0.0
.text 1953394 1953394 0 0.0
ota-requestor-app debug (read only) 2436737 2436737 0 0.0
(read/write) 125216 125216 0 0.0
.bss 49856 49856 0 0.0
.data 2232 2232 0 0.0
.data.rel.ro 67288 67288 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 207232 207232 0 0.0
.text 2058354 2058354 0 0.0
shell debug (read only) 2548121 2548361 240 0.0
(read/write) 141096 141096 0 0.0
.bss 57448 57448 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 76688 76688 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 227666 227698 32 0.0
.text 2163378 2163586 208 0.0
thermostat-no-ble arm64 (read only) 2592644 2592868 224 0.0
(read/write) 158289 158289 0 0.0
.bss 65249 65249 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 83240 83240 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 165348 165380 32 0.0
.text 2187520 2187712 192 0.0
tv-app debug (read only) 3099633 3099633 0 0.0
(read/write) 257704 257704 0 0.0
.bss 167016 167016 0 0.0
.data 4848 4848 0 0.0
.data.rel.ro 79392 79392 0 0.0
.dynamic 608 608 0 0.0
.got 4848 4848 0 0.0
.init 27 27 0 0.0
.init_array 952 952 0 0.0
.rodata 248928 248928 0 0.0
.text 2662802 2662802 0 0.0
tv-casting-app debug (read only) 5562817 5563073 256 0.0
(read/write) 161968 161968 0 0.0
.bss 50248 50248 0 0.0
.data 2416 2416 0 0.0
.data.rel.ro 103048 103048 0 0.0
.dynamic 608 608 0 0.0
.got 4736 4736 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 343209 343241 32 0.0
.text 4941746 4941970 224 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2447424 2447528 104 0.0
.bss 213940 213940 0 0.0
.data 5872 5872 0 0.0
.text 1410068 1410172 104 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1174495 1174579 84 0.0
bss 142900 142900 0 0.0
rodata 141776 141812 36 0.0
text 810916 810972 56 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1154691 1154771 80 0.0
bss 142136 142136 0 0.0
rodata 133308 133340 32 0.0
text 800360 800416 56 0.0
p6 all-clusters-app default (read/write) 2563896 2563992 96 0.0
.bss 149120 149120 0 0.0
.data 2776 2776 0 0.0
.text 1522160 1522256 96 0.0
all-clusters-minimal-app default (read/write) 2508952 2509048 96 0.0
.bss 148400 148400 0 0.0
.data 2776 2776 0 0.0
.text 1467216 1467312 96 0.0
light-app default (read/write) 2439240 2439336 96 0.0
.bss 140456 140456 0 0.0
.data 2592 2592 0 0.0
.text 1397504 1397600 96 0.0
lock-app default (read/write) 2466496 2466584 88 0.0
.bss 140304 140304 0 0.0
.data 2600 2600 0 0.0
.text 1424760 1424848 88 0.0
telink light-switch-app tlsr9518adk80d (read/write) 796636 796728 92 0.0
bss 70576 70576 0 0.0
noinit 40416 40416 0 0.0
text 565130 565192 62 0.0
lighting-app tlsr9518adk80d (read/write) 816464 816564 100 0.0
bss 71420 71420 0 0.0
noinit 40416 40416 0 0.0
text 581452 581516 64 0.0

Copy link
Contributor

@turon turon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 LGTM

@andy31415 andy31415 merged commit f241dd2 into project-chip:master Jul 9, 2022
github-actions bot pushed a commit that referenced this pull request Jul 9, 2022
woody-apple added a commit that referenced this pull request Jul 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Groups Cluster- Issue in NameSupport attribute value
3 participants